--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 115f9c4b82363a8310dd15dacbb722a938b4f892
Parents : a77cc29
Author : Mark Qvist <mark@unsigned.io>
Date : 2025-11-24T16:23:38+01:00
Updated multiarch build
Changes
4 files changed, 21 insertions(+), 16 deletions(-)
Diff
diff --git a/.github/workflows/native_libs.yml b/.github/workflows/native_libs.yml
index 17d0c45..ded9973 100644
--- a/.github/workflows/native_libs.yml
+++ b/.github/workflows/native_libs.yml
@@ -13,7 +13,7 @@ on:
jobs:
build_windows:
name: Build Windows wheels (Python ${{ matrix.python-version }})
- runs-on: windows-2019
+ runs-on: windows-2022
strategy:
matrix:
python-version: ["3.11", "3.12", "3.13", "3.14"]
@@ -37,7 +37,7 @@ jobs:
python setup.py bdist_wheel
- name: Upload wheel artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: windows-wheels-${{ matrix.python-version }}
path: dist/*.whl
@@ -68,7 +68,7 @@ jobs:
python setup.py bdist_wheel
- name: Upload wheel artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: macos-x86_64-wheels-${{ matrix.python-version }}
path: dist/*.whl
@@ -100,19 +100,19 @@ jobs:
python setup.py bdist_wheel
- name: Upload wheel artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
with:
name: macos-arm64-wheels-${{ matrix.python-version }}
path: dist/*.whl
collect_artifacts:
name: Collect all wheels
- needs: [build_windows, build_macos_x86_64, build_macos_arm64, build_sdist]
+ needs: [build_windows, build_macos_x86_64, build_macos_arm64]
runs-on: ubuntu-latest
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- name: Download all artifacts
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
with:
path: ./artifacts
diff --git a/Makefile b/Makefile
index 52298c4..bf49b54 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ create_symlinks:
-ln -s ../LXST/ ./examples/LXST
build_wheel:
- cp ./lib/0.4.2/* ./LXST/
+ cp ./lib/static/* ./LXST/
python3 setup.py sdist bdist_wheel
-(rm ./LXST/*.so)
-(rm ./LXST/*.dll)
@@ -29,9 +29,9 @@ native_libs:
./march_build.sh
persist_libs:
- -cp ./libs/dev/*.so ./libs/static/
- -cp ./libs/dev/*.dll ./libs/static/
- -cp ./libs/dev/*.dylib ./libs/static/
+ -cp ./lib/dev/*.so ./lib/static/
+ -cp ./lib/dev/*.dll ./lib/static/
+ -cp ./lib/dev/*.dylib ./lib/static/
release: remove_symlinks build_wheel create_symlinks
diff --git a/march_build.sh b/march_build.sh
index d8ed8f4..479adbb 100755
--- a/march_build.sh
+++ b/march_build.sh
@@ -1,12 +1,13 @@
#!/bin/bash
docker run --rm -v $(pwd):/io quay.io/pypa/manylinux_2_34_x86_64 /io/build_wheels.sh
-docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_x86_64 /io/build_wheels.sh
-docker run --rm -v $(pwd):/io quay.io/pypa/manylinux_2_31_armv7l /io/build_wheels.sh
docker run --rm -v $(pwd):/io quay.io/pypa/manylinux_2_34_aarch64 /io/build_wheels.sh
docker run --rm -v $(pwd):/io quay.io/pypa/manylinux_2_39_riscv64 /io/build_wheels.sh
-docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_aarch64 /io/build_wheels.sh
-docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_armv7l /io/build_wheels.sh
-docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_riscv64 /io/build_wheels.sh
+
+# docker run --rm -v $(pwd):/io quay.io/pypa/manylinux_2_31_armv7l /io/build_wheels.sh
+# docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_x86_64 /io/build_wheels.sh
+# docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_aarch64 /io/build_wheels.sh
+# docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_armv7l /io/build_wheels.sh
+# docker run --rm -v $(pwd):/io quay.io/pypa/musllinux_1_2_riscv64 /io/build_wheels.sh
./fetch_libs.sh
\ No newline at end of file
diff --git a/setup.py b/setup.py
index faeb282..a30bb44 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,11 @@ from setuptools.command.build_ext import build_ext
import os
import platform
-BUILD_EXTENSIONS = True
+if "SKIP_EXTENSIONS" in os.environ: BUILD_EXTENSIONS = False
+else: BUILD_EXTENSIONS = True
+
+if BUILD_EXTENSIONS: print(f"Building LXST with native extensions...")
+else: print(f"Building LXST without native extensions...")
with open("README.md", "r") as fh: long_description = fh.read()
exec(open("LXST/_version.py", "r").read())
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────